Conversation
…e-overlap axis (Otto 2026-05-01, 2x-confirmed) When a PR branch goes DIRTY because main moved, the discriminating signal between traditional rebase and cherry-pick-supersede is line-region overlap (not file overlap alone). Worked examples this session: PR #1161 unmergeable on CLAUDE.md (intermediate merges in same region) → superseded via #1164 from fresh main; same tick PR #1155 clean rebase (no line overlap). Cherry-pick-supersede saves 10-30 minutes vs fighting cumulative conflicts. Memory file documents protocol, decision rule, two worked examples, and what NOT to do (bulk-copy old state regresses intermediate merges). Per the meta-rule (PR #1160), this is a load-bearing learning that needs CLAUDE.md scope or pointer. Memory file + MEMORY.md row landing pair-edit; CLAUDE.md pointer can be added in follow-up if rule proves to fire on more cases (currently 2x; promotion threshold tracked). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
There was a problem hiding this comment.
Pull request overview
Adds a new substrate memory entry documenting a decision discipline for handling DIRTY PR branches (clean rebase vs “fresh-branch + reapply edits + supersede”), using two same-tick worked examples, and indexes it in memory/MEMORY.md.
Changes:
- Added a new memory file describing the rebase-vs-supersede decision rule and protocol.
- Added the corresponding index entry to
memory/MEMORY.md.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| memory/feedback_rebase_decision_discipline_clean_rebase_vs_cherry_pick_supersede_otto_2026_05_01.md | New rule/memo capturing the rebase decision discipline + worked examples. |
| memory/MEMORY.md | Adds an index row linking to the new memory file. |
| List the files your branch edits. Then: | ||
|
|
||
| ```bash | ||
| git log origin/main --not <branch-base> --format='%H' \ |
|
|
||
| # Commit + push + open new PR | ||
| git add <files> | ||
| git commit -m "<title> (rebased clean from main)" |
Comment on lines
+22
to
+40
| 1. **First, identify the line-overlap signal.** Run: | ||
|
|
||
| ```bash | ||
| git fetch origin main | ||
| git diff origin/main...HEAD --stat | ||
| ``` | ||
|
|
||
| List the files your branch edits. Then: | ||
|
|
||
| ```bash | ||
| git log origin/main --not <branch-base> --format='%H' \ | ||
| | xargs -I{} git show --stat {} | ||
| ``` | ||
|
|
||
| List files modified by main's intermediate merges since | ||
| your branch diverged. | ||
|
|
||
| 2. **Decision rule** based on file overlap: | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Substrate landing for the rebase-decision discipline named in PR #1165 tick-history. Two same-tick worked examples (#1155 clean rebase + #1161 unmergeable → #1164 supersede) discriminated by line-region overlap.
Memory file + MEMORY.md row pair-edit per memory-index-integrity rule.
🤖 Generated with Claude Code